Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 21 Sep 2011 17:42:21 +0000 (10:42 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 21 Sep 2011 17:42:21 +0000 (10:42 -0700)
commitbff2e60c2a708d5122d31f5e6b81104f144bc730
tree4aca7a515ce2c895de341d2b5186845aa9b04510
parent6b4f280f572d7341144f2a19e24f224d41342587
parent77cc47bf87681217486324aac06594f1196766c0
Merge from trunk.